Standarizing directory variables and names, adding comments