Standarizing some terms and adding comments