Refactoring OBDFilter