Keane cleanup

I didn't change any logic, merely cleaned up the code for now.
Make sure to look at the diffs of the individual commits and their messages to see the progression of the files. I made lots of commits so you can see the changes at a granular level. :)