Simplify some structure