Moved Export out of Formatting