Readability update and variable name changes

Updated placement of {} in order to improve readability. Changed variable names (c -> columnCounter, testnumber -> currentNumber) to better reflect their role.