Add temporary variable refactoring