Code: Minor improvements.
* Better taxonomy.
* Compact syntax for collection initializer
Merge pull request #416 from am11/master

Code: Minor improvements