formatting related fixes suggested by Patrick.