refactored code
Merge pull request #10 from ehenneken/refactor

refactored code