edit path variables, clean code