Fixup: Refactor -> Remove code duplication