Tidy up Spring bits
Spring-ified at last!