minor
minor refactorings in model data flow