#25 --- cleaning up spring config
#25 --- Cleaning up spring config