First of all, sorry about breaking the code. I'll make sure not to mess
with anything like that on the master branch again.

Redid some of the format stuff (won't break code, I assure you) that was
undone by the restoration to pre-me royally messing up the code.