Basic refactoring
Refactoring
Refactoring
Merge pull request #109 from genu/master

Small refactoring