cleaned up message_sending_job a bit