Remove hard coded array length