array_class argument, and refactor.