simplify code
improve output message