some golint'ing