Clean up and Documentation complete