Clean up some print statements