Minor changes suggested by IntelliJ