diff --git a/core/asm/asm.go b/core/asm/asm.go
index ce22f93f92..f49c621716 100644
--- a/core/asm/asm.go
+++ b/core/asm/asm.go
@@ -99,7 +99,7 @@ func (it *instructionIterator) Arg() []byte {
 	return it.arg
 }
 
-// Pretty-print all disassembled EVM instructions to stdout.
+// PrintDisassembled pretty-print all disassembled EVM instructions to stdout.
 func PrintDisassembled(code string) error {
 	script, err := hex.DecodeString(code)
 	if err != nil {
diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go
index d053e81ca4..37cacc98e0 100644
--- a/ethdb/memory_database.go
+++ b/ethdb/memory_database.go
@@ -43,6 +43,7 @@ func NewMemDatabaseWithCap(size int) *MemDatabase {
 		db: make(map[string][]byte, size),
 	}
 }
+
 // Put sets the value of the key.
 func (db *MemDatabase) Put(key []byte, value []byte) error {
 	db.lock.Lock()
diff --git a/event/filter/generic_filter.go b/event/filter/generic_filter.go
index d679b8bfa8..b641f5f070 100644
--- a/event/filter/generic_filter.go
+++ b/event/filter/generic_filter.go
@@ -23,18 +23,18 @@ type Generic struct {
 	Fn func(data interface{})
 }
 
-// self = registered, f = incoming
-func (self Generic) Compare(f Filter) bool {
+// g = registered, f = incoming
+func (g Generic) Compare(f Filter) bool {
 	var strMatch, dataMatch = true, true
 
 	filter := f.(Generic)
-	if (len(self.Str1) > 0 && filter.Str1 != self.Str1) ||
-		(len(self.Str2) > 0 && filter.Str2 != self.Str2) ||
-		(len(self.Str3) > 0 && filter.Str3 != self.Str3) {
+	if (len(g.Str1) > 0 && filter.Str1 != g.Str1) ||
+		(len(g.Str2) > 0 && filter.Str2 != g.Str2) ||
+		(len(g.Str3) > 0 && filter.Str3 != g.Str3) {
 		strMatch = false
 	}
 
-	for k := range self.Data {
+	for k := range g.Data {
 		if _, ok := filter.Data[k]; !ok {
 			return false
 		}
@@ -43,6 +43,6 @@ func (self Generic) Compare(f Filter) bool {
 	return strMatch && dataMatch
 }
 
-func (self Generic) Trigger(data interface{}) {
-	self.Fn(data)
+func (g Generic) Trigger(data interface{}) {
+	g.Fn(data)
 }