clean up message.js a tad