Further cleaned up the output.