Fix paths
Use variable, tidy up