Fixing suggestions from pull-request feedback
Fixing more suggestions from pull-request feedback