formatting cleanup (II)