Remove redundent code
Refactor