Minor Fix for cleanup variable code