Simplify target composition hierarchy and code