cleanup most of the issues flagged by golint.