Final formatting cleanup