getLocation API works now
Clean up