Add functions to plot
Remove most file paths