ReSharper in-depth code cleanup