Tweaked some code to make file path references easier to change