Add dynamic array, cleanup a bit