Code Review Suggestions

Suggestions are expressed in comments