Cleanup
Refactoring