Refactor for future development
unset CDPATH during run and set it back when exiting
code cleanup

Local variable name should not be capitalized.