Slight cleanup of wolf code
Fixes to previous commit
Merge pull request #692 from mc-server/wolfcleanup

Wolf cleanup