Refactor arrays out; we're already in the right scope, so they're not needed