Cleans up some more if statements before Frenky can get to them