code tidying
Merge branch 'master' of github.com:kindista/kindista