improve code-style