Cleanup and add short pwd in path.