Code style and comments added to messages