rework some os.path.join