CFY-1215: Address pull request comments