Addressing @jdbilshack comments in issue/91