consolidated and chained add and remove class calls