refactor 4
Merge pull request #59 from Assada/refactoring

refactor 4