Some spring-time refactoring...