Changes suggested by IntelliJ