[codestyle] Improve codestyle