More formatting and random stuff
Cleanup