making all code compatible with PSR-2