additional minor cleanup