Clean up
Update array syntax to PHP 5.4