format and simplify; highlighted some stuff in route53_test.go that
could be further simplified.
Signed-off-by: Miek Gieben <miek@miek.nl>