Some basic stylistic reformatting.