Cleaning up prints and comments