Code clean-up and formatting.
Sort output of --list alphabetically.