Cleanup and commenting for sharing