Clean Up

Did some cleaning of the output.