Refactoring the code
Merge branch 'refactor' into lee