Replaced hardtyped 15 constant with NUMBER_OF_COLUMNS, erased useless comments