Tidy up and reduce NPath compelxity