Improve Maintainability or both TOR and banned list