Cleaning up comments and error messages.