Refactoring to PSR-2

                   
|Q            |A  |
|---          |---|
|Bug Fix?     |y  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |?  |
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |