Order use statements alphabetically

Squashed commits from PS #394
Files should end in a single new line.