Modified code style based on formatter.xml