Tweak for golint and comments