Replaced some array definitions with bracket syntax