less conditions
code style fixed