Refactor Board