refactor a little bit
update locations data