code refactoring: cleanup
code refactoring: cleanup
updated README file
Merge pull request #1 from nadavmatalon/refactor

Refactor