Code clean up with resharper