php54 refactoring