Made path modification a lot easier to read and cleaner