*IntelliJ cleanup