Unify indent and formatting