cleaning up icloud store code a bit