Make better use of variables and paths.