Cleaned LINQ code