Refactoring

There are no behavior changes in this pull request, just refactoring moving things around. =)