PER-107: addressed most of the comments from pull request