some spring-time refactoring...