bug fix, update code style