First round of cleanup
My idea of decent formatting... now the fun begins