CON-1303: Address code review