Switch from indexed array to associative array for clarity