refactor board