Code refactoring and maintenance.
Merge branch 'master' of https://github.com/allevitan/olinbartering