PHP 5.4+ required, code cleaning