Remove addClass() and removeClass() and replace with classes.add() and classes.remove()

Some drive-by style clean up along the way.