cleanup
Refactoring and organizing