Cleaned up the array class