QuickMod refactor

These extra lines make sense though