QuickMod refactor

These lines would also be candidates for nuking