Starting to tidy and standardise use of proxy, operations & stores.