clean fix double code