making codebase PSR-2 compatible