More golint refactoring