improve class naming for toggling