some code cleanups
Merge branch 'develop' of https://github.com/zussel/oos into develop

merged