- Refactored formatting