Code cleanup suggested by IntelliJ