more minor cleanup to comments and whitespace