Refactored module:

* DRY up some code.
* Move building out of fetcher.
* Move magic number higher up.