OC-2465: review code