minor refactoring
Merge branch 'master' of https://github.com/mbalassi/strato-workshop
minor refactoring