comments and other golint-related changes