cleaning documentation and associated PrintMessage - in sync with #1