various minor cleanup