Cleaning up print statements