misc minor cleanup