More code tidy
Merge branch 'master' of github.com:chromy/Deeva