some additional minor cleanup