small clean-ups in abstract repository, store classes