Cleanup
Updated docs