changes raised during PR review