Improve codestyle