Reformat for cleaner look