cleaner layout of the hierarchy