Few small changes to ordering for clarity