refactoring do spring, fix #3