equartz refactoring