A little cleanup of the cheat