Changed sort commands to be more natural.