style change and bug fix