Broke down some classes and removed complexity