Data API: Cleaned, commented and managed exceptions