Syntax refactoring to match PSR-2 standards