Cleaning up message.js