More changes for code review

A few more changes were made to better reflect comments made during code
review.