Some code-style improvements