Good suggestions @jeffbyrnes.  For some reason I thought the linter would complain about this but I think I must have been lost in the linterlands on that one.