Some refactoring for PHP 5.3