Did some cleanup with resharper
More cleanup with resharper