CE-486 Polishing comments