Cleanup some of the formatting