Refactoring into smaller more centric class