fixed remove class, added check to addClass