some code-style improvements