Refactored
Refactored classes