Code commenting and fixing of variable names