Cleaned up a bit of array stuff