Refactoring that I shouldn't have been doing.
More refactoring i can't help it resharper is too awesome