Cleaning up comments and print statements