Updating Spring Version
Applying new code style