Renaming function and attribute and commenting, deleting useless code