Cleanup
Refactor