Cleanup as suggested by ReSharper