some golint work