Used Resharper to clean up code
More cleanup with resharper