320 clean up and optimisation of css selectors