Moved to PSR-2 standard