refactoring: clean up