Style corrections
Renamed width to matrix_size