Clean up
Refactoring