minor style improvements
Merge branch 'master' of https://github.com/NVI/modeling-revisited