Alphabetize output and cleaned up code
Merge pull request #3 from huiloon-y/master

Alphabetize output and cleaned up code