some code cleaning with resharper