Fixed issues reported by golint.