cleanup
Merge pull request #2 from pietdaniel/ref1

Small refactoring