refactor savon api