refactor seems to be complete