Refactor route53 implementation a bit