Minor re-formating