Clean-up by ReSharper