DAR-153 addressing QA code review comments