refactor + added url bulder for google api