ENH: minor cleanup