Tidy up and use root hinge loss weighting