golint-inspired cleanup