small changes for self code-review