ENH: More code cleanups