Tidied up the ordering