Cleaning up some code and docs.