#278 review comments fixes