refactored formats