Update some comments and whitespace