some golint based comments and renames