Cleaning up comments, logging.