um.  refactoring