refactoring do spring, issue #3