BS-9100 - code review feedback