Fixed assignment of array
Cleaned up the array a bit more