PSR syntax updates and removed array short tags for PHP 5.3 compatibility