A bit of Spring clean-up... BRB