Resharper code cleanup