board refactor