Clean up output and make it prettier