small board refactor