smaller refactorings
Merge branch 'master' of https://github.com/bitstars/droidar