adjustments according to code-review