cleaned up message.rb