Jojo code cleanup

[brrritssocold]

• Removed commented out code
• Removed unused variables
• Renamed variables
• Renamed functions
• Removed unnecessary code

[Kitteh6660]

I'll let this settle for a bit before the pull request is accepted.