Refactoring of code
Merge pull request #3 from ehenneken/refactor

Refactoring of code