composer refactored version with PSR2 coding standards