Starting Formatting Cleanup