make code more spring-oriented