Clean up
Refactor