QuickMod refactor

This one is acceptable