Re-factored location ID calling as parameter rather than a function