minor changes after code-review