Get rid of a hard coded array size