improve style, fix minor bus