CFY-1303: Address pull request comments