Inserting comments and removing debug messages