INT: OCD cleanup of variable names