clean redundancy code