* some code-style cleanup