All: Changed comments and variable names to reflect convensions.