Remove code duplication
Fix CS
Review fixes
Reduce NPath complexity
Merge pull request #70 from neeckeloo/remove-code-duplication

Remove code duplication