Clean up and replaced ambiguous arrays with object literals