Cleaned up location processing
cleaned up location processing