Fixed coding standard, compliance to PSR-2