next round of code review changes shortening comments and breaking down arrays