golint and govet clean up