current path code corrected, code cleanup