pull request fixes after code review