- Removed redundent code