Refactoring in preparation for new LINQ service