Clean up the way we create properties for stores