Bring coding standards into line with PSR-2