s/entdir/ent_dir since we use that slightly more
stylish cleanups