Refactored the format.