Fix comment
Remove temporary variable
Store clone, not original reference
Remove another temporary variable