WDNE Cleanup

* Adjusted improvements for the WDNE