REPORT-143 - Addressing code review comments