Made the add/remove class bits look nicer