Changed codestyle to PSR-2