Cleaned up Spring configuration a bit