Format Refactoring