PHP refactoring
PHP refactoring to new standards