Some code-style corrections