Refactor array expr