cleanup the code by resharper