cleaned with resharper