Tidy store code