Flatten unnecessary arrays
Closes #2