Cleaning up the api messenger a little.