Cleanup unused variables and update comment