Refactor the board