Correction of allot of resharper findings