board refactoring