more cleanup, tweak hierarchies