Tidying up method using new firstIfAny() method