...
refactored code
Removed some redundant code
...