Cleanup sorting code

Put sort directly into for loop; don't bother with giving it a variable.
Use named argument instead of relying on positional one.