Clean up output
Clean up code