Minor refactoring and optimization in IP evidence source and its rules