refactor(cfd): PR review fixes