refactor - fixup