Code: Minor improvements

* Better taxonomy.
* Compact syntax for collection initializer