Cleanup needed

[kevlu8]

Is your feature request related to a problem? Please describe.
I'm always frustrated when my eyes have to look at my code - they start to shrivel up and I need to run to my faucet to rinse them out.

Describe the solution you'd like
I would like the code to be cleaned up and most of the payloads ported to payloads.h

Describe alternatives you've considered
I could wear safety goggles, but those are a hassle to get and they block my vision so I can't type good code.

Additional context
Please, I'm going partially blind

ps this is a joke, i just want someone to help me clean up the code since i'm still a c++ newbie :,D