change zipper & clean code