- Removed few unnecessary lines