Cleanup
Start Refactoring