Fixed minor formatting issues and removed <139 lines of whitespace