Clean up comments and clarify wording