Cleaned up hierarchy