fix bug and style