consolidate some of the refactored classes