Fixing some variable names and comment formatting - no functional changes