Cleanup code by ReSharper