PCT-637: better comments