Merge pull request #15 from wagnert/master

Refactoring for new message message queue integration
reformatting to fit code style
phpcs
Merge pull request #16 from wick-ed/master

reformatting to fit code style