refactored the code
Merge branch 'refactoring'