Improve codestyle.