just a bit of cleanup
Merge pull request #4 from conduit/cleanup

just a bit of cleanup, add retry functionality, and retry limit