Minor change for comments and defining the variables by full path.