#8 Refactor arrays