tidy up units and ordering - gs