[all] some cleanup
Merge branch 'master' of github.com:ejoerns/candis