diff --git a/src/constants.go b/src/constants.go
index a238295..91c863a 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -8,7 +8,7 @@ import (
 
 const (
 	// Current version
-	Version = "0.10.1"
+	version = "0.10.1"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond
diff --git a/src/core.go b/src/core.go
index f3d0680..7e40bd5 100644
--- a/src/core.go
+++ b/src/core.go
@@ -55,7 +55,7 @@ func Run(opts *Options) {
 	rankTiebreak = opts.Tiebreak
 
 	if opts.Version {
-		fmt.Println(Version)
+		fmt.Println(version)
 		os.Exit(0)
 	}
 
diff --git a/src/history.go b/src/history.go
index 66159eb..4aa87fc 100644
--- a/src/history.go
+++ b/src/history.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 )
 
+// History struct represents input history
 type History struct {
 	path     string
 	lines    []string
@@ -15,6 +16,7 @@ type History struct {
 	cursor   int
 }
 
+// NewHistory returns the pointer to a new History struct
 func NewHistory(path string, maxSize int) (*History, error) {
 	fmtError := func(e error) error {
 		if os.IsPermission(e) {
diff --git a/src/matcher.go b/src/matcher.go
index d01ed23..3ea2fbe 100644
--- a/src/matcher.go
+++ b/src/matcher.go
@@ -96,7 +96,7 @@ func (m *Matcher) Loop() {
 		}
 
 		if !cancelled {
-			if merger.Cacheable() {
+			if merger.cacheable() {
 				m.mergerCache[patternString] = merger
 			}
 			merger.final = request.final
diff --git a/src/merger.go b/src/merger.go
index 4c7966a..cce8a94 100644
--- a/src/merger.go
+++ b/src/merger.go
@@ -82,7 +82,7 @@ func (mg *Merger) Get(idx int) *Item {
 	panic(fmt.Sprintf("Index out of bounds (unsorted, %d/%d)", idx, mg.count))
 }
 
-func (mg *Merger) Cacheable() bool {
+func (mg *Merger) cacheable() bool {
 	return mg.count < mergerCacheMax
 }
 
diff --git a/src/options.go b/src/options.go
index b2360a1..6a0d197 100644
--- a/src/options.go
+++ b/src/options.go
@@ -513,7 +513,7 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b
 		case "delete-char":
 			keymap[key] = actDeleteChar
 		case "delete-char/eof":
-			keymap[key] = actDeleteCharEof
+			keymap[key] = actDeleteCharEOF
 		case "end-of-line":
 			keymap[key] = actEndOfLine
 		case "cancel":
diff --git a/src/terminal.go b/src/terminal.go
index 9466170..6c3b147 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -106,7 +106,7 @@ const (
 	actCancel
 	actClearScreen
 	actDeleteChar
-	actDeleteCharEof
+	actDeleteCharEOF
 	actEndOfLine
 	actForwardChar
 	actForwardWord
@@ -141,7 +141,7 @@ func defaultKeymap() map[int]actionType {
 	keymap[C.CtrlG] = actAbort
 	keymap[C.CtrlQ] = actAbort
 	keymap[C.ESC] = actAbort
-	keymap[C.CtrlD] = actDeleteCharEof
+	keymap[C.CtrlD] = actDeleteCharEOF
 	keymap[C.CtrlE] = actEndOfLine
 	keymap[C.CtrlF] = actForwardChar
 	keymap[C.CtrlH] = actBackwardDeleteChar
@@ -436,7 +436,7 @@ func (t *Terminal) printHeader() {
 		}
 		line := idx + 2
 		if t.inlineInfo {
-			line -= 1
+			line--
 		}
 		if line >= max {
 			continue
@@ -462,7 +462,7 @@ func (t *Terminal) printList() {
 	for i := 0; i < maxy; i++ {
 		line := i + 2 + len(t.header)
 		if t.inlineInfo {
-			line -= 1
+			line--
 		}
 		t.move(line, 0, true)
 		if i < count {
@@ -862,7 +862,7 @@ func (t *Terminal) Loop() {
 			req(reqQuit)
 		case actDeleteChar:
 			t.delChar()
-		case actDeleteCharEof:
+		case actDeleteCharEOF:
 			if !t.delChar() && t.cx == 0 {
 				req(reqQuit)
 			}
@@ -1013,7 +1013,7 @@ func (t *Terminal) Loop() {
 				}
 				min := 2 + len(t.header)
 				if t.inlineInfo {
-					min -= 1
+					min--
 				}
 				if me.Double {
 					// Double-click
@@ -1099,7 +1099,7 @@ func (t *Terminal) vset(o int) bool {
 func (t *Terminal) maxItems() int {
 	max := t.maxHeight() - 2 - len(t.header)
 	if t.inlineInfo {
-		max += 1
+		max++
 	}
 	return util.Max(max, 0)
 }