Better name and cleanup array