Improve Path handling & clean some lines