Tidy up order normalization