Tidy up scored sorting