Enhance: format