Removed usesless thing :o
Message improvements