Minor code simplicity to match solution prior changeset