minor fixes and formatting after golint and gofmt