Fixing the bug where the Coverage is incorrectly calculated for DFns
Refactoring - cleaning up, and reverting some method extractions