Sorted some of the data structures (using vim's "!sort" command