Unify formatting