Refactor Array