You should be able to use a case statement similar to the one I linked in that commit. And please leave the earlier return in the first line of the method, we don't need to change that. Thanks.