QuickMod refactor

I prefer it if functions that are related are grouped together. Voting to roll back these extra lines.