Cleaning up the array variables class