code done adding msg to user and cleaning code