code-style refactoring