Cleanup only. Put everything in alphabetical order.