Update to follow PSR-2