refactor Board#setup
minor reorganizing