Cleaning up output format