Refactors for PHP 5.3 compatibility