refactorings
removed PathInfo
code cleanup