Final formatting fixes