use better selector and remove toggle class