refactoring bus model fixes #22