Applied changes after reviews

Got reviews from @natefinch and @ericsnowcurrently, applied
changes accordingly