[codestyle] Minor codestyle refactor.