Refactor Board class