Simplify some LINQ queries
Merge pull request #46 from lioncash/linq

Simplify some LINQ queries