Refactoring software to a more pythonic version
Merge pull request #25 from MaralAfris/pythonic_way

Refactoring software to a more pythonic version