Cleanup
Update docs