Code analysis by IntelliJ
changes structure