cleaned up location user helpers