Develop

Massive code formatting cleanup