cleaned up getAll methods