Code cleaning
Update file for PHP5.4