[MIN] IntelliJ fixes and optimizations