cleanup comments and logging.