Clean things up a bit with the arrays