various formatting cleanup