Formatting fixes, for realz