Some format refactoring.