QuickMod refactor

These three extra lines should go