Refactoring spring ...