Changing code style to a more readable style