more minor trimming and reformatting