more PHP refactor