Cleanup 2057

#2057 @tomchristie Hey, I just wanted to show you the direction I was going in. It's all just superficial changes. I'm going to keep breaking things down like this and then tidy up a bit when I get more time next week unless you have any objections.