Cleanup
Added documentation