ReSharper Cleanup.
More cleanup