reduces some complexity for coverage checks and directory tasks
Merge pull request #49 from loz/refactor

reduces some complexity for coverage checks and directory tasks