Make this a return and it simplifies the logic below.