Refactor Row and Board