tosulliv: minor refactoring