[Cleanup]
Cleanup and update documentation