A few style improvements

Plus a change on how the DHT library is used.