more output messages rework/code cleaning