style, code reductions
Merge branch 'master' of ssh://github.com/maqetta/maqetta
Merge branch 'master' of ssh://github.com/maqetta/maqetta