Refactoring in accordance with code style