[MIN] IntelliJ fixes and optimizations
[MIN] Merged