simplify the structure

simplify the structure