style, and bug fix