format
Minor clean up
Introduce PathHelper