Refactor game board