EloquentRepository cleaned up and updated