Cleaning up user-facing language and comments