Merge "Reduce indentation with early return"