Clean up Context and array notation