Cleanup some formatting