Add missing return and remove else statements.