Clean up of print statements