Clean up output
adjust user print statement updates