Refactoring of JFilter