Final formatting fixes, hopefully