Refactoring, introduction objets (module, filter, etc.).