Addressing review feedback from @dahlbyk and @shiftkey