cleaned up an unfinished refactoring