Some code-style fixing