Simplify the initial setup of the matrix and change comments accordingly