QuickMod refactor