Board refactoring