Updated docs
Cleanup