Updates to documentation and clean up
Additional Cleanup