More minor format fixes to keep within 80 char per line