cleaned code
Merge pull request #15 from linorabolini/code_cleanup

cleaned code