Refactor array processing for property