Documentation and Clean up