Some refactoring, simplified output
Merge branch 'master' of https://github.com/andyeff/skybot