Replace custom add/removeClass with jQuery ops

Slim down the code by using jQuery's already existing removeClass/addClass ops.