Cleaned up the syntax of the various linq statements