Manage stored messages
Small coding style refactor