refactor fixup