Update array indexing method
Simplify some old expression stuff