fixup! Refactor