Use existing store location code

This removes nearly duplicate code