Re did entity framework query to be written neater/faster