some formatting cleanup
merged