Refactor: cleanup