Is this if + return needed?