Refactoring... addClass/removeClass => toggleClass