code cleanup, return meaningfull (even too chatty) messages