Reduce Complexity

I did a bunch of stuff to make Scrutinizer happy and I think the score is worse now. 

In progress.