Added changes needed after the code-review operation.