Manually reformat/refactor code

[vertesians]

Not just an application of rustfmt, all the changes here were done by hand. I think the code is cleaner this way, but YMMV.

There shouldn't be any logical changes to the code, though some code was rewritten.