refactored
Merge pull request #2 from pietdaniel/refactoring

refactored