minor adjustments based on code review

These changes were based on code review comments on Friday.