Refactor array-contents