Applied simple cleanup measures suggested by IntelliJ