refactoring

Signed-off-by: steveeen <stkuehne@gmx.de>
Merge branch 'master' of https://github.com/steveeen/stachys-model