ENH remove duplication
ENH reduce redundancy
ENH brush up