minor cleanup, formatting, doc, small nitpiky things