Improved coding style
Merge ssh://github.com/codyle/facilitator