Applying new code style