Simplify structure