clarified and standardized the variable names in the src files