[misc] Improve codestyle