Refactored our classes