Refactoring
Cleanup