LINQ refactoring continued

Uncategorized

Performance improvement.