Initial work on formatting code according to PSR-2