return and remove the else