REFACTOR: clean up