cleaned up data access