formatting touchups
merged in master