Refactored code base to create smaller classes with individual responsibilities