Clean attribute name optimisation