Re-codestyle