Refactoring. Spring pur.