BART - minor refactor