Added class Message. Formatting changes.