Clean up
fixing hierar