LYR-143 addressed code review notes