refactor someplace