General cleanup of code.
Improve Retrieve process for own sanity.