Remove temporary variable per PR feedback