cleanup/format updates