fix code-review issues