diff --git a/commands.go b/commands.go
index dd2d4b5..ff7a7b3 100644
--- a/commands.go
+++ b/commands.go
@@ -22,10 +22,7 @@ func Every(duration time.Duration, fn func(time.Time) Msg) Cmd {
 		n := time.Now()
 		d := n.Truncate(duration).Add(duration).Sub(n)
 		t := time.NewTimer(d)
-		select {
-		case now := <-t.C:
-			return fn(now)
-		}
+		return fn(<-t.C)
 	}
 }
 
@@ -35,10 +32,7 @@ func Every(duration time.Duration, fn func(time.Time) Msg) Cmd {
 func Tick(d time.Duration, fn func(time.Time) Msg) Cmd {
 	return func() Msg {
 		t := time.NewTimer(d)
-		select {
-		case now := <-t.C:
-			return fn(now)
-		}
+		return fn(<-t.C)
 	}
 }
 
diff --git a/paginator/paginator.go b/paginator/paginator.go
index d1f8dc7..924a48e 100644
--- a/paginator/paginator.go
+++ b/paginator/paginator.go
@@ -44,7 +44,7 @@ func (m *Model) SetTotalPages(items int) int {
 	}
 	n := items / m.PerPage
 	if items%m.PerPage > 0 {
-		n += 1
+		n++
 	}
 	m.TotalPages = n
 	return n
@@ -89,10 +89,7 @@ func (m *Model) NextPage() {
 
 // LastPage returns whether or not we're on the last page.
 func (m Model) OnLastPage() bool {
-	if m.Page == m.TotalPages-1 {
-		return true
-	}
-	return false
+	return m.Page == m.TotalPages-1
 }
 
 // NewModel creates a new model with defaults.
diff --git a/textinput/textinput.go b/textinput/textinput.go
index a0a5674..6173547 100644
--- a/textinput/textinput.go
+++ b/textinput/textinput.go
@@ -182,7 +182,6 @@ func Update(msg boba.Msg, m Model) (Model, boba.Cmd) {
 	}
 
 	switch msg := msg.(type) {
-
 	case boba.KeyMsg:
 		switch msg.Type {
 		case boba.KeyBackspace:
diff --git a/viewport/viewport.go b/viewport/viewport.go
index 72b93c3..2caed53 100644
--- a/viewport/viewport.go
+++ b/viewport/viewport.go
@@ -82,7 +82,6 @@ func Update(msg boba.Msg, m Model) (Model, boba.Cmd) {
 
 	case boba.KeyMsg:
 		switch msg.String() {
-
 		// Down one page
 		case "pgdown":
 			fallthrough
@@ -122,7 +121,6 @@ func Update(msg boba.Msg, m Model) (Model, boba.Cmd) {
 		case "k":
 			m.LineUp(1)
 			return m, nil
-
 		}
 	}