QuickMod refactor

Good idea