this return statement is identical to the next. Rework this so there is only one return statement