corrections as per code-review