Refactoring for Export: Formatting