Fixed some issues with PSR-2 compliance.
Merge