Removing redondant calls ; using better $(...) selector