Code style changes.
PHP 5.4+ requirement