Implemented changes suggested in CodeReview on PullRequest