start unify structure of code