cleaned up use of message class