board capture minor refactor