[PAXEXAM-568] review and minor cleanup