Fixed location name.  Refactored data functions