[#204] Minor refactor

* DRY: Reuse extract algo from FileUtil
* Cleanup