MAJOR Formatting Cleanup