CFY-1215: Address comments on pull request