Improve comments for API Documentation