Minor clean up
Introduce PathHelper