Refactoring on board