Rearrange path setting for readability