It looks good to me, in general.
I just have one small comment below.
Martin, please address Tariq's feedback.
Sorry for the delay. I am on PTO for this week and
have been travelling.
I will take a closer look when I get
a more stable intenet connection tonight.
Thanks,
--Martin