implement pull request mentioned improvements