Refactoring
Refactoring & cleanup