addressed issues mentioned in pull request