Tighted up store selector code