cleanup and polish
Merge branch 'master' of git@github.com:gentimouton/swarch.git