diff --git a/lib/src/util/safe_render_manager/safe_render_manager.dart b/lib/src/util/safe_render_manager/safe_render_manager.dart
index 313e6e09c..319128690 100644
--- a/lib/src/util/safe_render_manager/safe_render_manager.dart
+++ b/lib/src/util/safe_render_manager/safe_render_manager.dart
@@ -53,7 +53,7 @@ class SafeRenderManager extends Disposable {
   SafeRenderManager({Element mountNode, this.autoAttachMountNode = false})
       : mountNode = mountNode ?? new DivElement();
 
-  /// Renders [content]into [mountNode], chaining existing callback refs to
+  /// Renders [content] into [mountNode], chaining existing callback refs to
   /// provide access to the rendered component via [contentRef].
   void render(ReactElement content) {
     _checkDisposalState();
@@ -103,7 +103,7 @@ class SafeRenderManager extends Disposable {
   /// with whether the component was actually unmounted.
   ///
   /// Unmounting could fail if a call to [render] is batched in with this
-  /// unmount during the propagation of this event. In that case, something
+  /// unmount during the propagation of this event. In that case, some
   /// other call wanted something rendered and trumped the unmount request.
   ///
   /// This behavior allows the same SafeRenderManager instance to be used to
diff --git a/lib/src/util/safe_render_manager/safe_render_manager_helper.dart b/lib/src/util/safe_render_manager/safe_render_manager_helper.dart
index 9dc297d4c..cb13cd419 100644
--- a/lib/src/util/safe_render_manager/safe_render_manager_helper.dart
+++ b/lib/src/util/safe_render_manager/safe_render_manager_helper.dart
@@ -44,10 +44,9 @@ class SafeRenderManagerHelperComponent extends UiStatefulComponent<SafeRenderMan
 
   @override
   render() {
-    final content = state.content;
-    if (content == null) return null;
+    if (state.content == null) return null;
 
-    return cloneElement(content, domProps()..ref = chainRef(content, _contentRef));
+    return cloneElement(state.content, domProps()..ref = chainRef(state.content, _contentRef));
   }
 
   void _contentRef(ref) {
diff --git a/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart b/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart
index 1c72b9b17..db8e3ce7d 100644
--- a/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart
+++ b/test/over_react/util/safe_render_manager/safe_render_manager_helper_test.dart
@@ -1,5 +1,5 @@
 @TestOn('browser')
-library safe_unmounter_test;
+library safe_render_manager_helper_test;
 
 import 'dart:async';
 
diff --git a/test/over_react/util/safe_render_manager/safe_render_manager_test.dart b/test/over_react/util/safe_render_manager/safe_render_manager_test.dart
index 0836ea81e..509a00aeb 100644
--- a/test/over_react/util/safe_render_manager/safe_render_manager_test.dart
+++ b/test/over_react/util/safe_render_manager/safe_render_manager_test.dart
@@ -1,5 +1,5 @@
 @TestOn('browser')
-library top_level_render_manager_test;
+library safe_render_manager_test;
 
 import 'dart:async';
 import 'dart:html';
@@ -14,7 +14,7 @@ import 'package:w_common/disposable.dart';
 
 import 'test_component.dart';
 
-/// Main entry point for TopLevelRenderManager testing
+/// Main entry point for SafeRenderManager testing
 main() {
   setClientConfiguration();
   enableTestMode();
@@ -72,7 +72,7 @@ main() {
           expect(mountNode.children, isNotEmpty);
         });
 
-        test('', () async {
+        test('', () {
           renderManager.tryUnmount();
           expect(mountNode.children, isEmpty);
         });
@@ -95,7 +95,7 @@ main() {
         });
       });
 
-      test('invokes the provided callback immediately when nothing has been rendered', () async {
+      test('invokes the provided callback immediately when nothing has been rendered', () {
         expect(mountNode.children, isEmpty, reason: 'test setup sanity check');
 
         bool onUnmountCalledSynchronously = false;
@@ -109,7 +109,7 @@ main() {
       });
     });
 
-    group('automatically attaches and detached the mount node', () {
+    group('automatically attaches and detaches the mount node', () {
       setUp(() async {
         // Clean up the manager from the above setUp block.
         await renderManager?.dispose();