* improve readability of code
* extract PathHelper class in place of duplicated code
*