Clean up the code.

[TheNachoBIT]

Code's starting to get messy, with a lot of unnecessary checks.

We need to clean the whole system up at some point until its too late.

[RobotoSkunk]

I'll check this