Improved shitty formatting

What a mess.