Refactored
Cleanup