Wolf cleanup

* Cleaned up wolf code