Cleanup
Added more docs