Refactor for smaller classes

A couple of refactorings designed to make classes smaller. I think they are also improvements for readability, etc.