Refactor codestyle