Some untested minor cleanup