Clean the hell up out of the code