Clean up of print statements and options