REFACTOR: Cleanup