Revert format
Created by: Zaharid
Commit 21e64268 added a large amount of unrelated formatting changes which show up in history and make various things difficult to revert and merge (which is how I realized). Revert these formatting changes and add back the substantive changes.