A bit of simplification/hierarchy improvement