* use defer to avoid tracking lock
* simplify control flow
remove control flow on errExit by switching from bool to int
cleanup and simplify
since dns.TXT is an external dependency, it is safer to add keys to the fields to avoid some potential ordering issues if changes in this field occur with upstream
Merge pull request #522 from alouche/minor_cleanup

Minor cleanup