refactor : improve structure. make code simple