Fix CS, code & code comment remarks from PR review