Further simplification of toggleClass logic