Cleanup and updated Docs