Cleanup: unused variables, comments, variable names.