Unified the formatting