Updated Spring version and tidied up.