Better style
Fix bug with disappearing buses