Refactor Board and Game classes