Handling Messages as well, and small code clean (comments).