few minor cleanup