Refactor board