Refactored format