Removing more out var usage