remove some code-style bugs