One step forward.
Using new IntelliJ code formatter.