Fixed minor issues reported by golint and go vet