code refactoring
Merge pull request #3 from nadavmatalon/refactor

code refactoring