Refactored to style guidelines
Merge pull request #409 from ppp0/issue-409

Refactor composer module to guidelines