IntelliJ fixes/cleanup items