Tidied up order by arrow and code