Massive code re-formatting of new code