SOL-20 Adding some code changes suggested during code review and bok choy tests