Get rid of arrays

Those aren't really needed.