General formatting, renaming and cleanup changes, we should probably only use var variable declarations when the variable type can't directly be inferred (such as in LINQ statements) and such