[COOK-3213] Make changes pointed out during review