Ww3 feature/clean up

Another try at submitting a pull request for ww3.