proper ReSharper code cleanup