Clean up code and make message nbr actualize automatically