more refactoring out god objects