QuickMod refactor

Not IMO