Refactored to simplify dependencies and decouple formatting modules.
Optimized property formatting.