Cleanup
Refactoring 7