WIP: Improvements to a42root
a42root: Code cleanup
Merge pull request #212 from pwaller/a42root-improvement

Improvements to a42root