Refactor
Refactor and cleanup