Cleaning up output a bit