Clean up variable name and restore comment.