bus: minor refactoring