cleanup confusing logic - ntop001