Cleanup comments and logging.