QuickMod refactor

Done.