Refactor for nullable sheet name changes

Refactor for review.

Thanks.