structure: golint and govet improvements