refactored common Row and Column code into module; refactored specs