INT-3339: Polishing and PR comments