QuickMod refactor

This way the code is cleaner.